bitkeeper revision 1.1236.1.51 (42272095QxAhIP6x9_72fHg_JpS8Xw)
authorcl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Thu, 3 Mar 2005 14:35:01 +0000 (14:35 +0000)
committercl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Thu, 3 Mar 2005 14:35:01 +0000 (14:35 +0000)
Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk


Trivial merge